🎖️GitЯра🎖️
Commit 42b07b22d7f2ed10d0ecc876796d8102d27631e6
Parents : d6cdace
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-08-13T21:57:04Z
Committer : GitHub <noreply@github.com>
Date : 2026-08-13T21:57:04Z
chore(build): bump flatpak-sources plugin to 0.1.7, drop Isolated Projects workaround (#6690)
Changes
5 files changed, 7 insertions(+), 14 deletions(-)
Diff
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03eb986e26..57f30e5733 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -459,7 +459,7 @@ jobs:
# are runtime-only and would be missed by :assemble).
- name: Generate Flatpak Sources
run: >
- ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true
+ ./gradlew --no-build-cache
-Dgradle.user.home=${{ runner.temp }}/flatpak-gradle-home
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
diff --git a/.github/workflows/reusable-check.yml b/.github/workflows/reusable-check.yml
index 7410257245..346a3b2ab8 100644
--- a/.github/workflows/reusable-check.yml
+++ b/.github/workflows/reusable-check.yml
@@ -580,7 +580,7 @@ jobs:
# runtime classpath. :assemble alone would miss runtime-only deps (skiko, ktor-cio, …).
- name: Generate Flatpak Sources
run: >
- ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true
+ ./gradlew --no-build-cache
-Dgradle.user.home=${{ runner.temp }}/flatpak-gradle-home
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
diff --git a/.github/workflows/verify-flatpak.yml b/.github/workflows/verify-flatpak.yml
index 39039b076d..ec384fecb7 100644
--- a/.github/workflows/verify-flatpak.yml
+++ b/.github/workflows/verify-flatpak.yml
@@ -51,7 +51,7 @@ jobs:
- name: Generate flatpak-sources.json
run: |
- ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true \
+ ./gradlew --no-build-cache \
-Dgradle.user.home="$RUNNER_TEMP/flatpak-gradle-home" \
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
cp build/flatpak-sources.json flatpak-sources.json
diff --git a/scripts/verify-flatpak/verify.sh b/scripts/verify-flatpak/verify.sh
index c35c4798ec..1dc55d001b 100755
--- a/scripts/verify-flatpak/verify.sh
+++ b/scripts/verify-flatpak/verify.sh
@@ -79,7 +79,7 @@ if [[ $SKIP_REGEN -eq 0 ]]; then
rm -rf "$GRADLE_HOME_ISOLATED"
# The settings plugin (org.meshtastic.flatpak.sources.settings) captures URLs from
# build start — no init script or -I flag needed.
- (cd "$REPO_ROOT" && ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true \
+ (cd "$REPO_ROOT" && ./gradlew --no-build-cache \
-Dgradle.user.home="$GRADLE_HOME_ISOLATED" \
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources)
cp "$REPO_ROOT/build/flatpak-ops-sources.json" "$SOURCES_JSON"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 917aed121e..b987036a15 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -36,16 +36,9 @@ plugins {
// Develocity + CCUD + build cache; shared with build-logic, versions from the catalog.
id("meshtastic.develocity")
id("org.gradle.toolchains.foojay-resolver") version "1.0.0"
- // Applied on demand only — see below.
- id("org.meshtastic.flatpak.sources.settings") version "0.1.5" apply false
-}
-
-// The flatpak-sources plugin reads Gradle.extensions, which Isolated Projects forbids; Gradle 9.7
-// enforces that and fails every task in the build. Only :captureFlatpakSources needs the plugin, and
-// its callers already pass -Dorg.gradle.isolated-projects=false, so gate it on an opt-in property. Remove the gate
-// once org.meshtastic.flatpak.sources.settings > 0.1.5 ships an Isolated-Projects-safe release.
-if (providers.gradleProperty("meshtastic.flatpakSources").isPresent) {
- pluginManager.apply("org.meshtastic.flatpak.sources.settings")
+ // 0.1.7 fixed the Isolated Projects incompatibility (shares state via a BuildService instead of
+ // gradle.extensions) that previously required gating this behind an opt-in property.
+ id("org.meshtastic.flatpak.sources.settings") version "0.1.7"
}
@Suppress("UnstableApiUsage")
Served by rngit 1.5.0 - Generated in 0.09s